Merge tag 'upstream/3.001.006'
authorgregor herrmann <gregoa@debian.org>
Sun, 3 Aug 2014 21:21:35 +0000 (23:21 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 3 Aug 2014 21:21:35 +0000 (23:21 +0200)
commitdf012b78fa037db8816cc5fadc28b01059f5096c
treef35d20cb7e80077e63dcd23d2b5a859d13b58ea9
parentc4d5e8acabd5db5850b159df2d0a9c81b2671444
parent6dcca9fc1cf397acbfe632d0a8fa6efa5b1da9f2
Merge tag 'upstream/3.001.006'

Upstream version 3.001.006